From b5ea25c500bb8702ca85f9696bb52c17b6325c5b Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Mon, 3 Sep 2001 06:45:17 +0000 Subject: [PATCH] Patch from vishnu@pobox.com (Joshua N Pritikin) to emit signal at the Sun Sep 2 17:38:42 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct time, #59727 * gtk/gtkbutton.c (gtk_button_update_state): Get depressed correctly. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkbutton.c | 5 +++-- gtk/gtktreeview.c | 7 +++++-- 9 files changed, 71 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6db0a6c007..534b95f0e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sun Sep 2 17:38:42 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from + vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct + time, #59727 + + * gtk/gtkbutton.c (gtk_button_update_state): Get depressed + correctly. + Sun Sep 2 21:41:21 2001 Owen Taylor * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6db0a6c007..534b95f0e6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Sun Sep 2 17:38:42 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from + vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct + time, #59727 + + * gtk/gtkbutton.c (gtk_button_update_state): Get depressed + correctly. + Sun Sep 2 21:41:21 2001 Owen Taylor * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6db0a6c007..534b95f0e6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Sun Sep 2 17:38:42 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from + vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct + time, #59727 + + * gtk/gtkbutton.c (gtk_button_update_state): Get depressed + correctly. + Sun Sep 2 21:41:21 2001 Owen Taylor * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6db0a6c007..534b95f0e6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Sun Sep 2 17:38:42 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from + vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct + time, #59727 + + * gtk/gtkbutton.c (gtk_button_update_state): Get depressed + correctly. + Sun Sep 2 21:41:21 2001 Owen Taylor * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6db0a6c007..534b95f0e6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Sun Sep 2 17:38:42 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from + vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct + time, #59727 + + * gtk/gtkbutton.c (gtk_button_update_state): Get depressed + correctly. + Sun Sep 2 21:41:21 2001 Owen Taylor * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6db0a6c007..534b95f0e6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Sun Sep 2 17:38:42 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from + vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct + time, #59727 + + * gtk/gtkbutton.c (gtk_button_update_state): Get depressed + correctly. + Sun Sep 2 21:41:21 2001 Owen Taylor * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6db0a6c007..534b95f0e6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Sun Sep 2 17:38:42 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from + vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct + time, #59727 + + * gtk/gtkbutton.c (gtk_button_update_state): Get depressed + correctly. + Sun Sep 2 21:41:21 2001 Owen Taylor * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index a671ee6406..61cafd9967 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -1054,6 +1054,7 @@ gtk_button_finish_activate (GtkButton *button, gtk_grab_remove (widget); button->button_down = FALSE; + gtk_button_update_state (button); if (do_it) @@ -1224,8 +1225,8 @@ gtk_button_update_state (GtkButton *button) gboolean depressed; GtkStateType new_state; - depressed = button->in_button && button->button_down; - + depressed = button->button_down && (button->in_button || button->activate_timeout); + if (!button->button_down && button->in_button) new_state = GTK_STATE_PRELIGHT; else diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 1b53af30cf..5871fd3193 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -4512,6 +4512,7 @@ gtk_tree_view_deleted (GtkTreeModel *model, GtkRBTree *tree; GtkRBNode *node; GList *list; + gint selection_changed; g_return_if_fail (path != NULL); @@ -4524,8 +4525,7 @@ gtk_tree_view_deleted (GtkTreeModel *model, gtk_tree_row_reference_deleted (G_OBJECT (data), path); /* Change the selection */ - if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED)) - g_signal_emit_by_name (G_OBJECT (tree_view->priv->selection), "changed"); + selection_changed = GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED); for (list = tree_view->priv->columns; list; list = list->next) if (((GtkTreeViewColumn *)list->data)->visible && @@ -4568,6 +4568,9 @@ gtk_tree_view_deleted (GtkTreeModel *model, } _gtk_tree_view_update_size (GTK_TREE_VIEW (data)); + + if (selection_changed) + g_signal_emit_by_name (G_OBJECT (tree_view->priv->selection), "changed"); } -- 2.30.2